Merge tag 'upstream/1.0.3'
authorAron Xu <aron@debian.org>
Tue, 15 Dec 2015 16:03:12 +0000 (00:03 +0800)
committerAron Xu <aron@debian.org>
Tue, 15 Dec 2015 16:03:12 +0000 (00:03 +0800)
Upstream version 1.0.3


Trivial merge